wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2371 commits 157 branches 562 tags 714 MiB
Commit graph

901 commits

Author SHA1 Message Date
Bartek Przybylski
c2392bbace db overwriting, gallery creating fix 2012-01-08 11:25:08 +01:00
Bartek Przybylski
21c4515465 rename fix, licence header added 2012-01-08 11:01:25 +01:00
Bartek Przybylski
23f52aa6fd Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-01-08 01:34:50 +01:00
Bartek Przybylski
2de3b4bd17 rename and delete hooks 2012-01-08 01:32:11 +01:00
Cloud Dumper
5b57cd310e Also use track_number to retrieve song track. 
This adds support for id3v2 tags such as TRACK/TOTAL.
 2012-01-08 00:30:57 +01:00
Cloud Dumper
6b95d7427a Sort results from music collection getters. 
Albums and artists are now ordered by name, song by track number and name.
 2012-01-08 00:30:57 +01:00
Bartek Przybylski
e51957b4de gallery version bump to force db update 2012-01-08 00:22:28 +01:00
Bartek Przybylski
9ed3c31fc9 automatic adding of photo to album, feedback for user while scanning, general cleanup 2012-01-08 00:14:34 +01:00
Frank Karlitschek
33847dd101 enable gallery and admin_export by default at least for the alpha and beta. 2012-01-07 13:33:53 +01:00
Georg Ehrke
f18e866a1e improve search function 2012-01-06 14:36:24 +01:00
Georg Ehrke
db490fbc8f Merge branch 'master' into calendar 2012-01-05 21:02:58 +01:00
Georg Ehrke
cb445deb5f fix login check in ajax files 2012-01-05 21:02:11 +01:00
Georg Ehrke
486694c2ec fix js for repeating events 2012-01-05 20:54:44 +01:00
Georg Ehrke
a01a3d412c fix autodetection for the week of the month 2012-01-05 17:53:13 +01:00
Georg Ehrke
edc9a150aa fix editeventdialog for monthly repeating events with a specific weekday and weeknumber combination 2012-01-05 17:49:09 +01:00
Georg Ehrke
d3a0c7354c fix repeat rule for every weekday 2012-01-05 17:09:01 +01:00
Georg Ehrke
a88cc91ad9 fix end for repeating events 2012-01-05 17:05:30 +01:00
Frank Karlitschek
e0a058c732 remove error output if symlink already exists. this can happen if a user removed config.php to trigger the setup wizzard 2012-01-03 17:23:50 +01:00
Georg Ehrke
fe59015126 Merge branch 'master' into calendar 2012-01-03 13:51:55 +01:00
Georg Ehrke
30857b24ea Merge branch 'master' into calendar 2012-01-02 11:41:18 +01:00
Georg Ehrke
5ccd26959f remove unused js 2012-01-02 11:39:23 +01:00
Georg Ehrke
e6739d230e add function to detect always the timezone 2012-01-02 11:35:50 +01:00
Thomas Tanghus
fb4c3bd9ce Merge git://gitorious.org/owncloud/owncloud into oc_image 2012-01-02 01:09:22 +01:00
Robin Appelman
536bc3d3c5 add jplayer source 2012-01-01 23:48:38 +01:00
Thomas Tanghus
853d1730c7 Merge git://gitorious.org/owncloud/owncloud into oc_image 2012-01-01 20:07:01 +01:00
Michael Gapczynski
64a24191a3 Fix return for empty Shared folder in opendir() 2012-01-01 14:04:16 -05:00
Thomas Tanghus
1b146b85d2 Removed redundant DB queries. 2011-12-31 01:34:22 +01:00
Thomas Tanghus
97471b5c2a Thumbnails was overwriting default style so hover and active didn't work. Moved them to the 'a' element instead. 2011-12-30 23:39:31 +01:00
Thomas Tanghus
830a34a10a Merge git://gitorious.org/owncloud/owncloud into tanghus_contacts 2011-12-30 21:09:42 +01:00
Thomas Tanghus
4793d25c57 Added license and waiver of conditions for jquery.inview. 
CSS fix on contact list.
Query contacts from multiple address books.
 2011-12-30 21:07:16 +01:00
Bartek Przybylski
31663cfff5 contacts entry duplication fix 2011-12-30 17:47:14 +01:00
Bartek Przybylski
96dc279e8e Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-12-30 17:06:48 +01:00
Bartek Przybylski
2ea20862fc gallery fixes 2011-12-30 17:06:29 +01:00
Georg Ehrke
3bb11db943 Merge branch 'master' into calendar 2011-12-29 19:16:33 +01:00
Thomas Tanghus
a70fbcea28 More missing js. 2011-12-28 10:31:45 +01:00
Thomas Tanghus
5a99310cdf Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails 
Fixed some conflicts.
Conflicts:
	apps/contacts/css/styles.css
	apps/contacts/templates/index.php
 2011-12-28 10:14:59 +01:00
Bart Visscher
16e4e6dcc3 Contacts: small merge cleanups 2011-12-27 22:44:52 +01:00
Bart Visscher
3e2e5196d2 Merge branch 'tanghus_remote_backup' of git://gitorious.org/~tanghus/owncloud/tanghus-owncloud 
Conflicts:
	apps/calendar/export.php
	apps/contacts/index.php
 2011-12-27 22:18:01 +01:00
Bart Visscher
5fd595c0bf Calendar: add loading indicator 2011-12-27 21:50:31 +01:00
Robin Appelman
5bff1c8ad1 some coding style fixes for the pdf viewer 2011-12-27 14:19:07 +01:00
Robin Appelman
f009ede753 some styling changes for the pdf viewer 2011-12-27 14:09:22 +01:00
Robin Appelman
1efb4a0c61 remove debug messages in console 2011-12-27 13:41:22 +01:00
Bartek Przybylski
f7674d06d3 pdf viewer from Google Code-In program 2011-12-27 12:36:51 +01:00
Georg Ehrke
ffa835c56f fix the default setting for yearly repeating events 2011-12-26 19:59:15 +01:00
Thomas Tanghus
16c8f62658 Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails 2011-12-26 13:27:53 +01:00
Georg Ehrke
9eef57faed make repeating events editable 2011-12-25 23:19:49 +01:00
Georg Ehrke
8ee53708ae use pre-decrement instead of post-decrement 2011-12-25 15:07:53 +01:00
Georg Ehrke
5e6fa608eb use OC_JSON::checkLoggedIn() in all ajax files 2011-12-22 16:31:01 +01:00
Georg Ehrke
469e983a02 fix merge conflicts 2011-12-21 22:16:46 +01:00
Bartek Przybylski
1383cb51e7 removing and renaming albums 2011-12-21 21:55:52 +01:00