fabrixxm
|
d7410f9e47
|
Merge pull request #2238 from fabrixxm/develop
Revert "Merge pull request #2223 from rabuzarus/2912_photo_widget"
|
2016-01-04 11:48:41 +01:00 |
|
|
fabrixxm
|
fcf7a791f1
|
Revert "Merge pull request #2223 from rabuzarus/2912_photo_widget"
This reverts commit 83e54f70d3, reversing
changes made to ecf576bdd0.
|
2016-01-04 11:46:19 +01:00 |
|
|
fabrixxm
|
83e54f70d3
|
Merge pull request #2223 from rabuzarus/2912_photo_widget
photo aside widget for profile page
|
2016-01-04 10:06:07 +01:00 |
|
|
fabrixxm
|
ecf576bdd0
|
Merge pull request #2237 from tobiasd/20160103b
moved include Scape to top of the file
|
2016-01-03 19:50:16 +01:00 |
|
Tobias Diekershoff
|
75ed2f830d
|
moved include Scape to top of the file
|
2016-01-03 19:15:13 +01:00 |
|
rabuzarus
|
29c671bb22
|
photos aside widget:permissions cleanup
|
2016-01-03 16:09:05 +01:00 |
|
|
rabuzarus
|
1ab022f4df
|
photos aside widget: move dependencies to the header
|
2016-01-03 15:45:02 +01:00 |
|
Michael Vogel
|
771d0c4bfa
|
Merge pull request #2224 from rabuzarus/2812_js_scrollbars
Since we can easily remove it, we can accept this - and change it back if we need to. I haven't check accessibility - but this can be done later.
|
2016-01-03 14:09:17 +01:00 |
|
|
fabrixxm
|
56e7f722a8
|
Merge pull request #2236 from tobiasd/20160103a
Typo in DE translations
|
2016-01-03 13:55:14 +01:00 |
|
|
Tobias Diekershoff
|
680f1073cb
|
Typo in DE translations
|
2016-01-03 12:57:42 +01:00 |
|
|
Tobias Diekershoff
|
2b5366ce15
|
Merge pull request #2235 from annando/1601-bugfix-sql-api
Bugfix: The table name was wrong
|
2016-01-03 08:37:39 +01:00 |
|
|
Michael Vogel
|
ba9054d8a3
|
Bugfix: The table name was wrong
|
2016-01-03 08:12:00 +01:00 |
|
|
Tobias Diekershoff
|
9015b081ee
|
Merge pull request #2234 from annando/1601-bugfix-duplicate-like
Bugfix: Duplicate check for likes wasn't reliable
|
2016-01-03 07:51:41 +01:00 |
|
|
Michael Vogel
|
01e20cded3
|
Merge pull request #2233 from fabrixxm/issue_api
API: fix item activities count
|
2016-01-03 00:38:57 +01:00 |
|
|
Michael Vogel
|
fba08409b4
|
Some more places that need to be adjusted
|
2016-01-03 00:28:11 +01:00 |
|
|
Michael Vogel
|
6c3d0f82c2
|
Bugfix: The duplicate check for likes wasn't reliable
|
2016-01-03 00:17:28 +01:00 |
|
|
fabrixxm
|
20809cf725
|
API: fix itemactivities count
api_format_items_likes() has now uses builtin_activity_puller() to correctly count activities
|
2016-01-02 12:54:57 +01:00 |
|
|
fabrixxm
|
5758302f21
|
small doxigen comment fix
|
2016-01-02 12:53:42 +01:00 |
|
|
Tobias Diekershoff
|
0f615fdcd7
|
Merge pull request #2232 from annando/1601-bugfix-request
Bugfix: The request process from DFRN hadn't worked anymore
|
2016-01-02 10:03:48 +01:00 |
|
|
fabrixxm
|
d090dc19a7
|
Merge pull request #2231 from annando/1601-dont-send-to-archive
Don't send messages to contacts that are archived
|
2016-01-01 17:59:02 +01:00 |
|
|
Michael Vogel
|
2ed3ae1aab
|
Bugfix: The request process from DFRN hadn't worked anymore since the last pull request
|
2016-01-01 17:49:07 +01:00 |
|
|
Michael Vogel
|
38ee2def5d
|
Don't send messages to contacts that are archived
|
2016-01-01 13:05:05 +01:00 |
|
|
Tobias Diekershoff
|
9d4d29ad9e
|
Merge pull request #2228 from fabrixxm/issue_api
Fix small bug in api
|
2015-12-31 09:49:28 +01:00 |
|
|
Tobias Diekershoff
|
8a5fada863
|
Merge pull request #2138 from fabrixxm/dbstructure_multicolumn_primarykey
Allow multicolumn primary keys in dbstructure
|
2015-12-31 09:49:00 +01:00 |
|
|
fabrixxm
|
2a9affe818
|
Fix small bug in api
|
2015-12-31 09:46:59 +01:00 |
|
|
fabrixxm
|
907d20940a
|
Merge pull request #2221 from rabuzarus/2812_vier_mobile_icons
vier: make TopNavBar mobile friendly
|
2015-12-31 09:38:27 +01:00 |
|
|
fabrixxm
|
6a8f5f9204
|
Merge pull request #2226 from rabuzarus/3012_colorbox
colorbox: update library to 1.6.3
|
2015-12-31 09:18:39 +01:00 |
|
|
fabrixxm
|
a3448e4156
|
Merge pull request #2227 from tobiasd/20151231-DE
DE update to the strings
|
2015-12-31 09:17:59 +01:00 |
|
|
Tobias Diekershoff
|
ab5d0aa5e6
|
DE update to the strings
|
2015-12-31 07:32:15 +01:00 |
|
|
rabuzarus
|
77a230342f
|
perfect-scrollbar: added Source link to the lib
|
2015-12-30 16:26:57 +01:00 |
|
|
rabuzarus
|
466968952c
|
colorbox: update library to 1.6.3
|
2015-12-30 14:53:02 +01:00 |
|
|
rabuzarus
|
8a51e470e7
|
perfect scrollbars: added README
|
2015-12-30 14:22:13 +01:00 |
|
|
Michael Vogel
|
077dd6a6b5
|
Merge pull request #2225 from tobiasd/20151230-FR
FR update to the strings
|
2015-12-30 11:44:05 +01:00 |
|
|
Tobias Diekershoff
|
6961fa636a
|
FR update to the strings
|
2015-12-30 08:55:59 +01:00 |
|
|
rabuzarus
|
f8256fc53b
|
make perfect scrollbars work with quattro
|
2015-12-30 03:12:52 +01:00 |
|
|
rabuzarus
|
89c0a8f8a8
|
vier: remove double available accesskeys
|
2015-12-30 00:48:11 +01:00 |
|
|
rabuzarus
|
3366e530cd
|
photo aside widget: little polish
|
2015-12-30 00:37:24 +01:00 |
|
|
rabuzarus
|
20fbf670db
|
photo aside widget for profile page
|
2015-12-30 00:26:50 +01:00 |
|
|
Michael Vogel
|
b41ab85feb
|
Merge pull request #2220 from rabuzarus/2812_notify_menu
vier: some visual work on the notification menu
|
2015-12-29 14:31:41 +01:00 |
|
|
Michael Vogel
|
4e47b26e17
|
Merge pull request #2222 from rabuzarus/2912_vier_clear_widget
vier: add missing clear divs to right aside
|
2015-12-29 14:24:45 +01:00 |
|
rabuzarus
|
871fb609d4
|
vier: add missing clear divs to right aside
|
2015-12-29 02:01:17 +01:00 |
|
|
rabuzarus
|
51a8864519
|
vier: make TopNavBar mobile friendly
|
2015-12-29 00:23:59 +01:00 |
|
|
rabuzarus
|
e93156427e
|
use perfect-scrollbars for nav-notifications-menu (and in vier aside)
|
2015-12-28 23:16:34 +01:00 |
|
|
rabuzarus
|
43d35315db
|
vier nav-notification-menu: further polishing
|
2015-12-28 22:04:54 +01:00 |
|
|
rabuzarus
|
c7d2d95705
|
vier nav-notification-menu: small cleanup
|
2015-12-28 20:52:11 +01:00 |
|
|
rabuzarus
|
093a3e6742
|
some work on vier nav-notification-menu
|
2015-12-28 20:40:04 +01:00 |
|
|
Tobias Diekershoff
|
99861b9fa6
|
Merge pull request #2216 from fabrixxm/feature-api-like
Works on API and a small refractor, updated docs
|
2015-12-28 18:39:21 +01:00 |
|
|
Tobias Diekershoff
|
03000beac6
|
Merge pull request #2219 from fabrixxm/quattro
Fix video oembed appearance
|
2015-12-28 18:39:03 +01:00 |
|
|
fabrixxm
|
9a307a4e2b
|
Merge pull request #2218 from annando/1512-mail-participiants
Bugfix: The participants on the mail page were displayed wrong
|
2015-12-28 18:31:54 +01:00 |
|
|
fabrixxm
|
c2d1016014
|
remove linebreak in doc/api.md
|
2015-12-28 18:30:28 +01:00 |
|