harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,184 Commits 6 Branches 36 Tags
830b01bd2a54bec4bd534903ee980aa0d9a3e563
Commit Graph
4791 Commits
Author SHA1 Message Date
Haakon Meland Eriksen 830b01bd2a Space between Preview and Submit in jot.tpl 2015-11-20 21:12:09 +01:00
Haakon Meland Eriksen 90187eae37 Merge remote-tracking branch 'upstream/master' 2015-11-20 19:51:57 +01:00
Mario Vavti 7399f7a087 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2015-11-20 16:40:13 +01:00
Mario Vavti a3e47d26f6 make calendar language aware 2015-11-20 16:39:55 +01:00
jeroenpraat d3bef2adc3 update es+nl 2015-11-20 15:18:51 +01:00
Haakon Meland Eriksen 3b7b3ef2bb Rearranging buttons 2015-11-20 07:38:59 +01:00
Haakon Meland Eriksen b6e4611a91 Rearranging buttons 2015-11-20 07:35:43 +01:00
Haakon Meland Eriksen 2929bb672a Rearranging buttons 2015-11-20 07:29:45 +01:00
Haakon Meland Eriksen a4765bf954 Rearranging buttons 2015-11-20 07:03:36 +01:00
Haakon Meland Eriksen 0c2045beff Rearranging buttons 2015-11-20 06:52:35 +01:00
Haakon Meland Eriksen 22f6687f44 Merge remote-tracking branch 'upstream/master' 2015-11-20 06:27:46 +01:00
jeroenpraat c7652fc29c Had to switch these 2. Sorry. 2015-11-20 00:50:54 +01:00
jeroenpraat a890ee6864 Some bits 2015-11-20 00:39:47 +01:00
Haakon Meland Eriksen 059886a1e4 Merge remote-tracking branch 'upstream/master' 2015-11-19 18:44:33 +01:00
Mario Vavti ba52af786e move today button from aside to section title 2015-11-19 11:38:34 +01:00
Mario Vavti 929f524e77 css fixes 2015-11-19 11:17:24 +01:00
Haakon Meland Eriksen 7b4cfffc03 Merge remote-tracking branch 'upstream/master' 2015-11-19 00:00:35 +01:00
Mario Vavti b23284cba2 move moment.min.js and remove unneeded files 2015-11-18 23:56:25 +01:00
Mario Vavti e4145deeb7 some events refacturing 2015-11-18 23:50:42 +01:00
Haakon Meland Eriksen 0d232c612b Merge remote-tracking branch 'upstream/master' 2015-11-18 06:48:29 +01:00
redmatrix 68da4d90dc fix admin plugin hooks 2015-11-17 20:44:57 -08:00
Haakon Meland Eriksen 545dc5cf65 Merge remote-tracking branch 'upstream/master' 2015-11-18 01:52:11 +01:00
redmatrix a089064588 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-11-17 15:04:04 -08:00
redmatrix a06f7fbe2e photo album widget permissions issue 2015-11-17 15:03:27 -08:00
Mario Vavti 6fa0807550 more css fixes 2015-11-17 23:01:24 +01:00
Haakon Meland Eriksen c545ada746 Merge remote-tracking branch 'upstream/master' 2015-11-17 16:49:11 +01:00
Mario Vavti 9e3d130ad9 css fixes 2015-11-17 11:32:37 +01:00
Mario Vavti b531486dab show jotnets toggle button only if there are jotnets and whitespace fixes 2015-11-17 10:46:38 +01:00
redmatrix 6df98f080b fix api/direct_messages/new at least for the json case. We seem to have a missing template for XML 2015-11-16 19:17:39 -08:00
Haakon Meland Eriksen fd5d1416d9 Merge remote-tracking branch 'upstream/master' 2015-11-15 00:27:23 +01:00
jeroenpraat def5edf93c nl+es and some other bits 2015-11-14 20:43:34 +01:00
Haakon Meland Eriksen 9d6a4c1d05 Reorder buttons HME 2015-11-13 19:44:42 +01:00
Haakon Meland Eriksen 94bef08f15 Adding original jot.tpl from GitHub 2015-11-13 18:32:25 +01:00
Haakon Meland Eriksen 0178840c19 Merge remote-tracking branch 'upstream/master' 2015-11-13 16:45:31 +01:00
Haakon Meland Eriksen d04c73ae00 Reorder buttons 2015-11-13 16:31:48 +01:00
Haakon Meland Eriksen 495f21c08c Reverted changes - got white screen 2015-11-13 07:36:32 +01:00
Haakon Meland Eriksen d238cbea19 Regrouped post buttons 2015-11-13 07:03:30 +01:00
redmatrix 93e5449c08 really basic photo album widget for content regions 2015-11-12 20:22:36 -08:00
Haakon Meland Eriksen 921a2e0dc4 Regrouped post buttons 2015-11-13 00:07:09 +01:00
jeroenpraat 5afe8e5aa1 Small update to Bluegrid and generic-content-wrapper-styled to dreport 2015-11-12 22:10:20 +01:00
Haakon Meland Eriksen ba84d6ff7c Regrouped post buttons 2015-11-12 21:11:47 +01:00
Haakon Meland Eriksen d786502f19 Regrouped post buttons 2015-11-12 20:44:41 +01:00
Haakon Meland Eriksen 90463ee67d Make upload and encrypt easier on phones by editing jot.tpl 2015-11-12 07:45:37 +01:00
Haakon Meland Eriksen e26b558e53 Promoted upload of images and encryption 2015-11-11 23:55:05 +01:00
Haakon Meland Eriksen 85e5cd7f98 Rearranged comment buttons back 2015-11-11 23:43:41 +01:00
Haakon Meland Eriksen 1d8cac6e73 Rearranged comment buttons 2015-11-11 23:31:18 +01:00
redmatrix fba2603304 add avatars to likes/dislikes/etc. 2015-11-09 15:58:19 -08:00
redmatrix 7d5acef20a remove list bullets from extended like list 2015-11-09 15:18:26 -08:00
jeroenpraat b99b6b5ae9 This is better 2015-11-09 16:37:22 +01:00
jeroenpraat cda81e35db Using bootstrap classes, so other themes/schemas also work. Plus margin when collapsed. 2015-11-09 15:08:50 +01:00