Nemcio/meanTorrent
1
0
Fork 0
mirror of https://github.com/taobataoma/meanTorrent.git synced 2026-03-06 04:01:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,954 Commits 4 Branches 0 Tags
37899b2ef2fe77df5f0fef2df875975089bb83d6
Commit Graph

1954 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amos Haviv
62bf313c6a Simplified Gruntfile, Minor Bug Fixing 2014-05-20 20:19:51 +03:00
Amos Haviv
c290dc90a2 Fix indentation 2014-05-20 19:03:18 +03:00
Amos Haviv
d98205a005 Merge branch 'pr/70' into 0.3.1 2014-05-20 18:59:03 +03:00
Amos Haviv
30f977cb38 Support ngmin 2014-05-20 18:58:10 +03:00
Amos Haviv
6354178e12 Merge branch 'pr/72' into 0.3.1 
Conflicts:
	app/tests/user.server.model.test.js
	public/modules/articles/config/articles.client.config.js
	public/modules/core/controllers/home.client.controller.js
	public/modules/core/services/menus.client.service.js
 2014-05-20 18:51:26 +03:00
Amos Haviv
a7aa199019 Fixing indentation 2014-05-20 18:22:38 +03:00
Amos Haviv
75a9eda55e Moving to ng-bind fixing submenus 2014-05-20 18:15:04 +03:00
Amos Haviv
5c6efe2f60 Merge branch 'pr/69' into 0.3.1 2014-05-20 16:59:09 +03:00
Amos Haviv
dba1e8b2f2 Fixing grunt and version issues 2014-05-20 16:58:45 +03:00
arve0
9067499056 use ngmin, save some typing 2014-05-20 14:22:54 +02:00
Charles Packer
2aebecaa40 Added user test file 2014-05-19 15:39:58 -07:00
Michael Cole
c8e62e1005 Typo 2014-05-19 12:26:07 -05:00
Michael Cole
e746749650 Add 'grunt debug' task 2014-05-19 12:22:55 -05:00
Amos Haviv
2f3b951711 Fixing Versions 2014-05-19 17:40:11 +03:00
Amos Haviv
9575fdcfd4 Fixing Conflicts 2014-05-19 17:38:07 +03:00
Amos Haviv
59fc0de43d Merge branch 'pr/63' into 0.3.1 
Conflicts:
	app/tests/user.server.model.test.js
	public/modules/articles/config/articles.client.config.js
	public/modules/core/controllers/home.client.controller.js
	public/modules/core/services/menus.client.service.js
 2014-05-19 17:33:01 +03:00
Amos Haviv
be7cd4c422 Merge branch 'pr/61' into 0.3.1 2014-05-19 17:31:47 +03:00
Amos Haviv
1c5a7323e2 Merge branch 'pr/60' into 0.3.1 2014-05-19 17:31:26 +03:00
Michael Cole
66bf2dca4c Typo in test message: 2014-05-14 07:08:08 -05:00
Samuel Vijaykumar M
7cf1fc2adb Changed all the indents to the spaces(tab size 4) 2014-05-14 16:05:15 +05:30
Michael Cole
57f1e242fc Add a little info about the sample app 2014-05-12 22:36:14 -05:00
Michael Cole
46092dd1d2 Reformat and bootstrappify the client home view. 2014-05-12 22:24:14 -05:00
Ernest Conill
4fd55e4f6b minor fixes on client view 2014-05-11 00:31:38 +02:00
netusco
c89c8911f9 minor change on addMenuItem 2014-05-11 00:18:34 +02:00
netusco
e0fc7457b9 little fix on removeSubMenuItem() 2014-05-10 13:47:36 +02:00
Amos Haviv
95037207f8 Fixing some typos 2014-05-09 20:20:59 +03:00
Amos Haviv
4930d8120e Merge pull request #57 from netusco/master 
Wrong property on removeMenuItem
 2014-05-09 20:12:31 +03:00
netusco
12e81fd673 Create dropdown on menuitems with submenus 2014-05-09 13:54:00 +02:00
netusco
d0268ed319 updating calls to addMenuItem and addSubMenuItem 
We can still create normal MenuItems without the 'dropdown' class.
 2014-05-09 13:48:35 +02:00
netusco
7adb7f3ea2 adding submenus functionality to the menu service 
When having few modules like Articles, Blog, Services, etc... it's good to add the 'New Whatever' or other functionalities within a submenu structure.
 2014-05-09 13:44:03 +02:00
netusco
fca7e9ed6e fixing removeMenuItem on menu service 
Object menus had an unknown property menuItem that corresponded to link property (see addMenuItem).
 2014-05-09 13:22:48 +02:00
Amos Haviv
0e7ebb6da8 Fixing OAuth authentication 2014-05-08 00:14:59 +03:00
Amos Haviv
a180daeace Merge pull request #47 from darksniper87/master 
Update init.js
 2014-05-05 14:36:11 +03:00
darksniper87
bcbf2af07f Update init.js 
Just fixing some grammatical errors
 2014-05-05 11:21:31 +03:00
Amos Haviv
5a2eb6e779 Fixing grunt build task 2014-05-04 23:12:27 +03:00
Amos Haviv
9246d301c4 Merge branch '0.3.0' 2014-05-04 22:46:52 +03:00
Amos Haviv
51b2f31259 Updating Credits 2014-05-04 15:14:44 +03:00
Amos Haviv
9420d93118 Merge branch 'pr/46' into 0.3.0 2014-05-04 14:41:01 +03:00
Michael Cole
b8340cb6b3 Fixes #45 - Npm install error on 3.0 2014-05-03 12:30:58 -05:00
Amos Haviv
38f08ff6c3 Fixing articles 2014-05-02 19:16:18 +03:00
Amos Haviv
0b3dead3f0 Clean up article example 2014-05-02 18:50:09 +03:00
Amos Haviv
31a193196f Fix swig templates 2014-05-02 18:41:52 +03:00
Amos Haviv
1c7ae6ecb5 Configuring Extensions 2014-05-02 18:28:24 +03:00
Amos Haviv
14c3ce7cc9 Fix Config 2014-04-28 22:04:44 +03:00
Amos Haviv
27dfdfe622 Delete unused travis file 2014-04-28 21:46:26 +03:00
Amos Haviv
90d412a8ed Merge pull request #37 from sahat/patch-1 
Thank you @sahat
 2014-04-28 21:07:25 +03:00
Amos Haviv
7c0078cdaa Fix Karma and Menus 2014-04-28 20:52:29 +03:00
Sahat Yalkabov
30cd5209da SVG Badges 2014-04-27 21:59:45 -04:00
Amos Haviv
14f5d06d4f Fixed asset management structure 2014-04-27 21:51:42 +03:00
Amos Haviv
c91a3301bf Clean up 2014-04-26 20:44:37 +03:00